Correcting test and domain mappings