test cleanup
Start working on #33
...
more tuning for #33 fix