Add a unit test for #337