Issue #3376369 by Spokje, quietone, smustgrave, catch: Remove use of book in non profile and update tests (cherry picked from commit 2c6bb82a)