Fix the tests for Email Tags. #1558