Fixes to TestCaseTest.