Merge "Remove call_until_true from test module"