Added a new matcher test.
Lingering commit dealing with scenarios for the Sensors paper.