Minor test improvements.
Documentation cleanup