fix test dir layout