[BUGFIX] Adapt a couple of broken test file namespaces