Improve rerun test

for troubleshooting TNL-692

@cahrens @zubair-arbi