Merge pull request #1527 from shackbarth/dbtest