Merge "CertificateTest: fix error-prone code in test"