Simplify
Add multicast tests back