update test suite: better error reporting and bugfix