Merge "add volume list tests"