First cut
Merge pull request #393 from jesseeichar/reuse_test_datadir

Further improve speed of tests in IDE by reusing the last data directory
forgot this change
Merge branch 'reuse_test_datadir' into develop