Fix remaining consumption change tests
Merge pull request #3680 from dimagi/fix-consumption-tests

Fix remaining consumption change tests