Added more form/template tests