changed form to use form::model
slightly improved tests