Improve tests & form success handling in template.