Small fixes.
Update DB handler unit test.