Reorg of acceptance tests