a little modifies in Game.java and GameTest.java