[TASK] Fix Tests