[Refactor] steps use instance objects instead of factory to do data setup