sync the wordy as they had been implemented but not sync and fix / add missing unit tests & display name

sync the wordy as they had been implemented but not sync and fix / add missing unit tests & display name #2883