Add more FormBuilder tests;
Remove unneeded code.