Refactored dummy factory