buildbug script fixes. Move test files to matching core directory.