Merge "Add some more X.509 certificate tests"