- Cover both cases when var used or not in setup, single or multiple variables
- Remove iterator from setup