Reorganized test cases.