Merge "Fix CertificateFactoryTest API to BC"