Fix some remaining test cases