Merge "CertificateTest Update"