Cleaned up the tests.
Factored out the cipher conversion as well. Placeholder test.