finally fixing the failing tests on ci (I promise)

+review REVIEW-5263