Add unit test for issue 2316