reorg of test demo