Fix tests, assets, namespaces