renamed form_field to data_item in form_helper, fixed tests