Move choice forms in to tests