Issue #3376369 by Spokje, quietone, smustgrave, catch: Remove use of book in non profile and update tests
mentioned in commit 1004c40d