Correct button text in functional test
properly handle number fields (and blank version thereof) #25