Change test matchers to raise errors in case of failures and some renames