Merge "Add more NsdService tests"