Handled additional variant in test result.
Changed how CertificateError/match_hostname are imported.