refactored data_storage_spec.rb