Further wrangler init
tests (and refactorings)
#124
Merged
init
tests (and refactorings)
#124