Refactor and extend SOS::Client tests