Cipher test fixups

Write tests using the full "raw" version, rather than an encoded one, this makes them easier to read.