fix tests and cb to create