Fix failing tests for BR mode