Same change for TestCase