Updates the tests for #20235