Add namespaces to tests