Added Tests for ISSUE #296