Merge "Move back to openssl::X509 in tests" into main