Update namespace

* Enable extra tests
First pass on problem