Merge "Add extra list servers by host test"