Merge "Improve error message on volume tests failure"