- fix the failing tests