Add more tests for DataStore
Fix more logic in the DataStore found by tests (hell yeah!)
Add sinon and sinon-chai