Updated Examples to include namespaces

Also added tests