Add test for gh-645