More unit tests - coverage up over 60%.

Minor refactoring to make two hard-coded values used by BookKeeper configurable.