Redefine matchers using new syntax and custom failure messages