Fixup references
Rename namespace
adding tests for testhost