Fix tunnel unit test
Add hop count to SaveAs