Moved some stuff around, VDBSession is now used for testing and will have default behavior