Fix up test and update docs