Add test for #2421