Adding additional test cases for Issue # 381