CBCs moved to labs; also fixes for tests broken by footer checkin.