[TASK] Adjust a few failing tests