Refactored some mockup actions.
Merge pull request #736 from gorco/ActionsRef

Refactored some mockup actions.