refactor tests & form_tag