Fix test setup/teardown even more
Merge branch 'master' of github.com:dnanexus/dx-toolkit