FakeClientDataStore renamed to ClientDataStoreStub