Fixed up tests for the emailRecords case change.