Tech Debt: Refactor displayed errors and additional tests