Integration test fixes. 73 failures.