BIGTOP-920: Add HCatalog tests
BIGTOP-969. a few files belong to more than one package