Add tls tests and timeout
Merge branch 'master' of github.com:TheDistributedBay/TheDistributedBay