Fixed tests to test both no namespace and provided namespace