Changes to the datastore test framework (will probably fix test on CI
server).