Fix the import_crypto_module helper and factor some str/unicode helpers into the test util module
4 files changed