Update to pass integrations tests