Re-org namespaces in tests