Added Daniel's fix for the tests again
Added Daniel's fix for the tests again

OmerSchechter/anyway,hasadna/anyway,boazin/anyway,HamutalCohen3/anyway,hasadna/anyway,OmerSchechter/anyway,esegal/anyway,HamutalCohen3/anyway,omerxx/anyway,hasadna/anyway,omerxx/anyway,yosinv/anyway,omerxx/anyway,OmerSchechter/anyway,boazin/anyway,esegal/anyway,yosinv/anyway,HamutalCohen3/anyway,esegal/anyway,yosinv/anyway,hasadna/anyway,boazin/anyway