Update testing to reflect multicast update, fix some var names to be better