Add unit test for issue #39