added more to the test harness and fixed some issues with the datastore methods