Fix and feature in TestCase