[TASK] Fix flaky Acceptance Tests