Fix tests  

Namespace issues everywhere