Convert more node fixtures to factories