Bug 1095199 — Remove cb from tests