Reenable/rewrite flaky test [RTFACT-18493]