Reverting BaseGameTest changes