Updated to the latest version of Moq