Another take on amking tests work better when empty db