Refactor factory for junction spec