WIP: trying to fix cbook tests-04