added wrap-form-params and tests