some test config fixes
some test config fixes
Merge branch 'master' into dao-refactor