Fixed test namespaces that were broken due to earlier change.
Moved behavior routing to new namespace.