more tweaks to ensure we run right environment
Merge pull request #1761 from cloudedge/master

Update to Dev so that test db is created correctly