Merge pull request #9 from sharoonthomas/develop

Update to 2.8 #1405
Add test templates and use DictLoader in tests

* Add test templates
* Update tests to use the updated dict loader without sitename prefix