getting rid of defmatcher macro
fix tests
rename to-contain arg