Merge "Move all volume v2 service client unit tests to v3 dir"