Fixed tests for the namespacing renaming