Further improvements to gremlin executor timeout test #437