Changes relating to the latest build (namely that email addresses do not always appear in full). Also moved some hardcoded DOM specs to the DOM files.