Merge "Stop disabling TLS for tests"