Resolve test failures for BHC