Remove stubbing and add in a helper and fix factory