datastore: tests + addressing comments from upstream