Storage tests

Some preliminary tests for the Storage, will depend on #66

Happy to squash commits