Revert "storage haxes"

This reverts commit 7e722605741d64c5ded9113375c1050ca3a987d5.
Revert "Revert "storage haxes""

This reverts commit 4cefcd12032261dd2be428d0362ebf51be61ae48.
Update EventTest (revert Mads' revert)