[TASK] Fix broken tests