Testklasse refactored