Add tests for service resources
Add test for templates
Merge pull request #101 from continuuity/feature/more-hive-coverage

Feature/more hive coverage