docs and test fixes