Reorganise test cases.