removed circular dependency check and updated integration test