Working on the catalogue test cases