docs and test fixes
docs and test fixes