More renames
setdefault implemented for forms
Added choice field
Improved testing