Small fixes the database tests so it flawlessly passes in [mac] builds

Merged Tiago de Freitas Pereira requested to merge db-fixes into master

Merge request reports