Updates for testing hooks.
Update for nested namespaces.