Mock refactor