Clean up various things
Move and fix comment
Remove useless parameter
Fix ridiculous spelling error
Fix nameserver tests