Improve TestCase classes