Replan
Updated regression tests to use default matcher if there are no matches
Bit more progress with regression tests