Merge pull request #1400 from toopay/db-test-suite

Escape test