Improving suite settings
Merge pull request #542 from Borales/1.6-build-namespace-fix

Improving suite settings