I'm moving all the clean-up of BlockId de/serialization logic to a separate PR, so the tests will go there as well.

(The refactor of BroadcastBlockId will remain here)