Fix negative primary char calcs, add two book tests