Incorporate recent changes that were originally made in test/testssl