[#547] Fixes to datastore plugin
[#547] Test fixes for datastore