Fixing failing test cases.
Merge pull request #1200 from riteshchandawar/CB2B1

Fixing failing test cases.