Updated Moq, removed Moq.Contrib