Fix up the suite to pass in form arguments.