Feature/more hive coverage

Increase hive spec coverage... test for service/templates