Added test cases for commit 1f91f308fd0c0370bd50ac969d57a29b2fc4a038