Fix specs to run properly
Add Storage-spec
Add some specs