Can you rebase this on master? As it is, the diff removes the recently-added GnuTLS...
Fix cleanup in simple_test