Fixing test case failures.