Fix WhereClauseFilterTest failures due to multi tenant syntax changes