Adds datastore to helper export for easier test writing
Adds tests for the new datastore functionality