Documentation tweaks, DRYs up test a bit