Changed GetDatastore test to use singleton