Fixed comm-related unittest failures