Merge "Add unit test for volume limits client"