a bunch of test twiddles, docstrings and whitespace, but also split out loading a macless pkcs12 into a new test, since this seems to crash
2 files changed