Various doc and test fixes.