Fix up documentation, clean up test.

Final commit.