Session change to form_tag
Finish decouple tests