(temp/more to come) Email aggregation follow-up

 * Cleaned out i18n bundles caching
 * Refactored some tests