Merging in Dennis' multicast test tool