fix up the tests, add better error messages.