Fix tests
Merge branch 'patch-db'