Normalise identifiers and tests
Merge pull request #2 from richard-jones/feature/normalise_ids

Normalise identifiers and tests