More docs and fix a test.