getting integration tests to pass for the upgrade scenario