UnitTest for Issue #18