updated the dependencies
fixed up unit tests
Merge branch 'master' into pure-db