Test and doc fixes.