Simplify the database based tests