Merge pull request #139 from rjc123/newmappings

Initial mappings for DFE
Fix tests
Merge pull request #140 from rjc123/newsites

Fix DFE tests