simplify tests; fix error text