Fixed the tests for the AMD-no-Namespace improvement