#10218 Fix tests to prevent future regressions
#10218 Fix tests to prevent future regressions

tenkoma/cakephp,ADmad/cakephp,cakephp/cakephp,tenkoma/cakephp,dakota/cakephp,mvdriel/cakephp,berrygoudswaard/cakephp,ndm2/cakephp,CakeDC/cakephp,ADmad/cakephp,CakeDC/cakephp,dakota/cakephp,garethellis36/cakephp,berrygoudswaard/cakephp,ndm2/cakephp,mvdriel/cakephp,CakeDC/cakephp,mvdriel/cakephp,dakota/cakephp,garethellis36/cakephp,petteyg/cakephp,cakephp/cakephp,garethellis36/cakephp,davidyell/cakephp,ADmad/cakephp,ndm2/cakephp,petteyg/cakephp,CakeDC/cakephp,cakephp/cakephp,berrygoudswaard/cakephp,dakota/cakephp,davidyell/cakephp,cakephp/cakephp,petteyg/cakephp,ndm2/cakephp,ADmad/cakephp,davidyell/cakephp,garethellis36/cakephp,tenkoma/cakephp,mvdriel/cakephp,tenkoma/cakephp,petteyg/cakephp