Add missing refs
Parameterise encoding string for encryption, and check on decrypt
Remove obsolete clss
Updates for new data layout, and emit test data
Renove obsolete CipherData class