Added a couple more tests prior to meeting
Merge branch 'master' of https://github.com/rockwotj/CSSE376-Civ