Refactoring and midway through integration tests