quick hack to handle blocks that arrive at the sametime
updates reorg tests
Merge pull request #113 from matiu/bug/fix-reorg-tests

Bug/fix reorg tests