Fix bbid unit tests