Unit Test refactoring