Integration test fixes. 80 failures.