Update unit tests for Client
Remove unused exception.