Fixes after review with Niklas
Tidying up the storage_test after review with @niklasl