Better namespacing, make tests work!