Merge pull request #352 from alex/finish-test-crypto

complete the flake8-ification of this file