Adding filtering in run.
Fixed parameter tests.