Refactored some mockup actions.