Merge "Tests for DNS integration"