Merge "Fix tests for call_until_true function."