#556 test alignment with datastore plugins

Resolves #556