Merge "Add tests to verify volume command behavior"