Fix test cases related to how much / how many