Follow-up fix for bug#10644.
Make sure that params get passed to any modules used.
Make tests more robust.