Started simplifying MatchState more. Updated minitest and removed turn.