Fixed more problems with mkbuildtests