fix issue with breaking tests after core/test_bridge