various fixes, testing now works
Merge branch 'master' of github.com:timaeudg/CSSE376---Dargons-of-Kir