Bug/fix reorg tests

- migrates all reorg tests to the new test schema.