Merge "Switch to use test_utils.call_until_true"