added a bit better error reporting
updated test suite to new errors