Update ObjectMother to use StorageProvider