Fixed remaining specs by improving matcher wrapper

10/10 regression tests passing.