Closed Catalogo Refactoring and test