add confirm email, improve form template, update tests