Upgrade of Moq.