Fix GetBlocksMessage and unit test