Update for v0.10.4
Comment out unused gnutls code to avoid warnings
Revise test case
Update for v0.10.5