Restore datastore service tests (despite not using this service)