Updated test cases for new namespaces