Merge "Update NSD tests without AsyncChannel"