MDL-47225 core: Tidy up component normalisation tests