add missing datastore stub in tests
Merge remote-tracking branch 'upstream/master'