Fixed comcat, still working on shapefile, added tests