Remove `FormBuilder` deprecation warning about block argument and tests

Remove `FormBuilder` deprecation warning about block argument and associated tests