Added tests for issue #2.