Fixing tests associated with adding TLS option