More documentation edits. Cleanup for tests. Nominally putting under #411.