Minor cleanups
Asks for a rematch after the game
Clean up tests by reducing ceremony on Strings