Updated Player and tests to use game state as outlined in an email sent to the server team earlier this week.