Fixing Moq dependencies