Add specific tests runner to basetest and fix datastore bug