Fix the database reader test failures