Cleanup TestCase extends
Merge pull request #4910 from okonomi/test-case-extends-cleanup

Cleanup TestCase extends