Fix Moq tests