change to form_tag and decouple more tests