more dynamic test
minor style fixes
no need for tmpdir
Merge branch 'develop'