Add test for gh-1058