improved nameko test-coverage, & removed some unused code