Refactoring, unit test containers