Fix to matcher insert & test.