Merge pull request #596 from bhariharan/master

Fixing failing test
Making DBHelper one per DB as opposed to just one