Make database tests happy again