Move DNS tests around; fix a couple minor things
Change test system id for no reason
Add some more DHCP tests