Fix bug in collate data and add tests to catch it#31

mdales merged 1 commit intomainquantifyearth/aoh-calculator:mainfrom

mwd-fix-collate-dataquantifyearth/aoh-calculator:mwd-fix-collate-dataCopy head branch name to clipboard