Fix failing tests
Add TLS check issue #24