reorganize test cases