Minor documentation improvements
Minor changes to the tests