updated to use MultiTestDB
Merge branch 'dev'