fixed cake tests
Merge branch 'master' into process-children-names