Removed some leftover debug code
Moved tests and updated to use namespaces