Refactor task counting and step defs

refactor task counting

refactor step defs

- move step helpers to features/support
- re-order steps

all features passing