Merge "Modify Nsd{Service,Manager}Test to conform to its change"