Whitespace fixes
Make addOrUpdate update in-place instead of blindly creating new values
Index user emails
Fix name change in tests