Fix failing tests and use latest catch-error module
Update test wording