Updated refactored matchmaking controller and tests