add datastore and test