FormBuilder: refactorizing & test WIP I