Merge "Rectify volumes tests"