Various integration test fixes