Merge branch '1.6'
No codeception added with the guy generation
Merge pull request #494 from vinu/fix-namespace-cest

Fix namespace cest