Fixed several minor bugs (overflowing pages, etc.).  Updated the CFI
tests to accomodate the new pages.