Start and stop tunnel are more consistent, added more tests