CPORT-80 - add tests for client