fix unit test failure because of different ordering of tests; ensure accounts don't exist before initializing them
Merge branch 'master' into issue_186