Corrected classes

Fixed some problems revealed by CheckStyle, as well as one egregious
error in the BookTest class.