Example factories refactored, ready for action testing