Using until helper instead of custom solution for ES testing