Tweak tests to better work on an empty db