Merge "Add more test coverage for /etc/hosts lookup"