Merge "Added unit tests for classes in clds/client"