Itachi prepared the crow with Shisui's eye for Sasuke. am not sure he knew he would be resurrected.
as for Madara, he knew about his resurrection but not through edo tensei.
do ya prefer him to be in bijuu form or switch to normal? wouldn't it be better if he uses samehada... i miss him so much. its like he's lost in the action..