Add test for #538