Add a unit test for #359