Add test for 16589