Updating form builder methods and test cases