Update namespaces and remove tests