Integration test cleanups.
Fixed first migrated integration test to work.