[TASK] Test cleanup