Adding files to be compared against bake generated files, fixing bake templates in the meantime.

This is a followup of the discussion in https://github.com/cakephp/cakephp/pull/1458#issuecomment-22328899.

Writing assertContains or assertRegExp for generated code is a pain and making the test cover most part of it is very difficult.

Things like:
 ```
 } else {
 }
 ```

Are very easy to happen (which was the case) and was not being covered by the test.
Once I know your thoughts I will add more tests/files. So if its a +1, don't merge just yet.