fix RegistrationCatalog to pass all the tests