syntax s/should/expect/
Merge branch 'convert_matchers_to_expect'