Add a unit test for #626