Makes address salutation options configurable, fixes tests