db tests updated
Merge branch 'test'