Fix failing tests because of db cleaning issues