Remove tests
Update namespaces