updates to use MultiTestDB and other fixes