Add support for namespaces
Improve tests adding a namespace