Add test cases for #13821