Merge "Improve tests for TLS fallback."