[TASK] Fix a few tests