rewrite test to make better use of matcher
rename method and wording of messages