Doc. comments cleanup
Fixed test case for CakePHP 2.x