Integration test fixes- extensibility