Revert "Refactored dummy factory"

This reverts commit ce6fad1c3efb7d789c5e8ca5e21b63deef297830.