Updated tests after reorg.