Updated Factories for testing