Fix tests
Fix tests
New conversation list view