Refactored tests to better work with 2014.7.0 and allow easier setup
Merge branch 'master' into template
renamed top so it will not get run on highstate
basic templates working