integration test fixes