Updated game and tests
Updated game and tests