refactor catalog Test Cases