Merge "Add volume dependency test coverage"