[CLC-1235] Exposing the bDrive badge

[CLC-1235] Test fixes

[CLC-1235] Test fixes