Extracted scenario client extensions to separate file.
Partial client specs.