- integration tests and refactoring