Fixed test
Added dynamic form composition for the setting fields.