Remove useless comment
Refactor InvokeOp + fix tests