Fix some failing test cases.