Improve error reporting readability
Fix failing unit test