scalar tests correcting/adding for complex predicates