Adding latest developments in pagination testing and cleaning of catalog