[#1864] Faris - Fixed failing tests.