Remove Delegate
Enable test
Refactor ObjectFactoryAction, and add a few comments.