Add test for #16