Fix some more test cases