[#1540] Faris : Fixed failing unit tests.