Miscellaneous fixes to datastore

Refactor out dummy values for unit tests, fixes IOperation interface