Merge "Extend tests for external DNS integration"