Merge improvements to SSL test scripts