Added a unit test for #124