Documentation / DocTest fixes and tweaks