Fixing tests after Game changes