Fix for the datastore tests