Hacking our way through replacing bare JSON serialisation with using our custom functions, that we know handle using a cipher if we have one.

Now that I've figure out how to make tests fail, it's not so hard.