Added test for issue #36