Remove dm datastore

These patches fix bugs associated with tests only, this was originally part of another feature but it was separated to maintain a good workflow.