Restructuring test cases.