Normalise identifiers and tests