Fix annoying order splitting bug in Book, add some test helpers for cleanup