drive-test: limit to one cumulative connection; a few other tweaks