Game state test refactorings

Somehow the changes for #43 also got into this PR so I've closed that.
Yes