Finished GameState unit testing
Conflict between me and Chang fixed
Finally fixed merge