Merge pull request #389 from jschneier/master

fix skip test copy/paste typo
refactor ssl tests
Merge pull request #390 from jschneier/refactor-ssl-tests

refactor ssl tests