Getting integration tests to pass again