In light of changes to service templates, this commit updates/adds/removes related specs.
Attach a file by drag & drop or click to upload
