Add a couple more form elements to FieldBuilder plus unit tests