Fix CakePHP tests

Refs #697