[TASK] Update Tests