Fix tests, delete namespace