new tests, reorg some