[TASK] Fix failing tests