Fixed lots of tests to add namespaces