Better error reporting, testing complete