beef up hostmask testing