Moved everything into a namespace
cleaned up tests