Merge "Add tls support for tests"