More test case conversion