More core tests, so far so good
Merge branch 'master' of https://github.com/kraftman/Empires.git