Use `wait_for_*` arguments to `health` call to simplify waiting logic