Minor docstring changes, test prep