Refactoring CBs more in the first test