updated catalog class and code to test all latest xml file.