** Don't merge** Fixes to get tests running for BB refactor

WIP getting the test running for 1% / BB refactor.