Merge "Count volumes vs partitions and remove hard-coded expected result"