fix test cases hierarchy