two more unit tests, and a little simplification to take care of duplicated error reporting coverage.