CPE tests, fix up other tests