Get BB unit tests to pass