reverted some previously thought bugfixes and comment out a single test until it can be proven valid.
Latest changes to self encryption - WIP should finalise tomorrow. All design in place (hopefully)