A couple of minor fixes to the merge and update Moq Nuget package.