[#1668] Faris : Fixed the second defect as well as the failing tests.