Merge "Make test_clear_45877 more reliable and test more behavior"