Added test for FormBuilder class
Cleaned up FormBuilder class