Renamed StorageSchemas to Storage
Added two failing tests