Fixed EnricherTest and RecordTest