Fix namespaces & test runner