|#1368, 1367| modified E2E offline distribution tests