DOL-98 : Fixed test cases and compilation error.