Merge pull request #232 from digawp/datastore
Clean up state after test too

(main@01ee0860549f5b06eadfe0a60f56b89098a0778a)