use ... in helpers
Merge branch 'isolate' into 85-code-dir
helpers expect wd to be set
extract helpers
merge test files to reduce smells
Merge branch 'isolate' into 85-code-dir
move code
Merge branch 'isolate' into 85-code-dir