Update tests to match reality
Merge pull request #350 from rjc123/newmappings

Update tests to match reality