Added tests for issue #65