Add more tests for FormBuilder