Merge pull request #2064 from reaperhulk/simplify-x509

simplify x509 csr builder tests