Refactoring TU and Integration Test