Fixed bug in configuration setting of options
Added new client tests