[CBS-CLIENT] Increase code coverage