Also, use valid base categories for
not-in-preferred_predicate_category_list test.
Also, improve coding style.
Also, after changing preferred predicate category list, only reindex
the module containing predicates instead of the whole site, to reduce
test duration.