Merge pull request #1324 from toopay/db-tests

Improved DB tests