Add test users. Fix message view