Fix for spliting test emails