Test catalog

@briankip please review. 
Check #103 for details