StorageLocation is editable at all states
Fix broken tests