Improvements to TestCase