Merge branch 'db-fixes' into 'master'

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

See merge request !93