DON'T MERGE -- Add further tests for #19949.