Change factory to make Email class instead of EmailMock, which is what it was doing before by mistake