DO NOT MERGE - reorg tester