Revised sql_where_or tests