Updated a few error messages, and updated some tests.