Test for multicast and also fixes