Tests for Survey Templates
Merge pull request #834 from graeme-f/master

Tests for Survey Templates