fix matchers, should pass now