Initial implementation of suggested changes

Committer: El--Presidente

Fix tests by adding Tor-mode parameter to test_connection.py

More fixes to test_connection

Bring up to date with latest develop changes

More messing around with test_connection.py