Resolve failed tests
Merge pull request #383 from rjc123/newmappings

Resolve failed tests