Move functional tests involving reorgs to reorg_test