Refactoring for full repo integration tests