Email count test changes