Satisfy tests

Certain enhancements to specify client options.

Defaults do not change.