Update tests to match expected mappings
Merge pull request #332 from rjc123/master

Update tests to match expected mappings