Remove dependency on collective.z3cform.widgets
Update RF tests