Finishing off a rebase, and finding places where we need to update the code to de/serialize using the StoreCipher.

Was concerned that the tests did not cover this, and found a way hack the tests to always use a cipher. In future, it would be good to contribute a way to run all tests both with and without.