update tests, add namespacing to services