GH-552: Eliminate extra block increment

[masqrauder]

Follow-up to the original GH-552 with a new branch of the same name.

• With these changes the block number is no longer double-incremented.
• These changes also include additional tests to verify the block number handles the max_block_count size chunks and doesn't skip any blocks by incrementing one too many times.