Fix unit tests so they pass with updated BCC logic