Remove Multicast, use chaining method or Bridge
Fix Tests to be buildable with latest changes