With changes for test case
Resoved merge issues