Small doc and test tweaks