Merge "Add test for volume list with all-tenants"