Fix BSR, add tests for BT and BSR