Minor changes.  Added more tests.