Refactoring the mockfilesessionstorage out of my life.