simplify code
Add output matcher; Enable negation