Integration test fixes