[TASK] Migrate leftover tests to namespaces