Update wording in unit test
Update tests and display
Merge