Testcoverage refactoring