Refactor game tests