[TASK] Fix some failing tests