More de-testing