change format of forms
adding tests and changing templates