Fixup tests and docs.  All but one pass.