More fixes to test cases.