Add 'cf_templates' to datasets zip file
Add new GetObservation tests, remove old ones.
Rework some of the DS and GC tests to avoid static variable mashing