Added test for issue #35