Resolve test failures for BHC
Resolve test failures for BHC
Merge pull request #396 from rjc123/newmappings

Resolve test failures