test and doc tweaks