Fixed typos.  Added a test driver.