Merge "Add additional checks to multicast tests"