Couple of test and compat output.

Created originally on Bitbucket by Anonymous

Was already merged in Bitbucket before import, marked as merged by the import user

• tests: updating test output

  We fix some outdated/incompatible test output

• compat: use Abort from error, not util

  This is where the class actually lives.