extending tests to include services, clusters, and templates

- Tests for services and templates
- Bug fixes