Merge "Improve volume pools tests code"