Fix mail and activity feed tests