Correctly extract name + use name if available in chat window
Update tests to work with user name included in contact