Tweaks to tests for new strand-safe vto router