wrap database tests in a transaction
Merge remote-tracking branch 'origin/master'