[TASK] Improve tests