Merge "Add unit tests for volume and snapshot manage clients"