Add Moq support