temporarily update to develop commit for BB
fix tests
Merge pull request #1324 from onepercentclub/feature/update-bb

Update for new BB develop branch