fix test organization