More doc fixes, more test enhancements.