Fix TLS heartbeat method wrapper.
Fix remaining test issues.