Add test for #22