Update integration tests for prior refactoring