Reverted changes in UserList and started refactor in UserListMessage and UserListMessageTest