Make datastore work with historical test data for the short term.