Updated parameters to the predicate methods.
Correct bug in filtered tests.