Merge pull request #232 from digawp/datastore

Clean up state after test too