Test cases for ISSUE-38
Test and fix for ISSUE-39
Addressing ISSUE-26