Added MatcherControl unittests, closes #81