Stronger test
doc tweaks