reorganize the test cases