Merge branch 'dcroft-move_template_test_files_to_new_folder' into 'master'

Moves other template test files to new location

See merge request gitlab-org/cluster-integration/auto-deploy-image!177