Improvement to TestCase (#76 and #77)