Improve test reporting and remove a bug in the testing code

Fixes issue where errors may be skipped on multiple tests
Greatly Improved error output