Change tests to resolve downstream conflicts
Merge pull request #347 from rjc123/localmunge

Change tests to resolve downstream conflicts