Additional testing, logging, and error messages.