Add tunnel_pid and test_server_port settings
#180
+44
−7
Merged