[#1540] Faris : Fixed failing functional tests.