minor improvements in the tests with CB