Added unit test for Issue #378