tests reorg and starting Schedule Support