Fix CS
Fix tests namespaces