refactored gamespage + trying to fix tests