Expose functional-test client options.

Also fixes a test assertion related to #deleteTemplate.