Fixing failing tests due to different states of the dbs