Updated DB tests.
Some improvements.