removing debugging code
fixing tests to work with namespacing