Add tests for MatchCtrl