Improved DomainsTest, hacked DomainCollector