Merge pull request #2253 from reaperhulk/name-oid-tests

switch tests to use NameOID