Restore datastore service tests (despite not using this service)
Merge pull request #457 from daf/unskip_coi_test

Restore datastore service tests (despite not using this service)