reorganized test cases