[TASK] Improve Test