more integration test fixes