Fix remaining test cases