fix(config) failing test

also replace *Datastore with Datastore