Added some tests for datastore
added some tasks for client handling