Add scenarios for number fields
Update scenarios
Remove useless spaces