Merge pull request #1694 from alex/x509-test-move

Updated tests for classes that have been moved