queries test + datastore cleaner