Change variable names to reduce confusion
Use assertObjects{,Dont}Conflict in more tests
Add CNAME–A/MX/SOA conflict test