Updated tests to run with relocated matchrules