Add some tests based on PR21711