[Task] Errors and tests corrections