Don't use comp. wrappers anymore.

We don't use the SimpleTest wrappers anymore except for those few occurrences.
This unifies it.
Also preparation for https://github.com/cakephp/cakephp/pull/1678