Added meaningful messages to printed errors. Removed code from earlier tests.