Minor sql predicate test tweaks