Added test for issue #16