Fixes to test cases.