Unit test fixes for client

Merge fixes