Updated FormBuilder tests