minor doc fixes, simplified test code