oops, changing error messages breaks tests.  make them match again.  don't change the tests.  change the error messages.  that way the error message's awkwardness hints at the code's awkwardness.