make gateway test more performant