Tweak support readme
Refactor payload class specs to use new matchers