Fixing tests (more namespace issues).