cb test
less refactor