Small refactorings, removed TestCase inheritance from empty test class.