Some test fixes and doc updates