Added somemore tests.  Cleaning up for the 0.7.3 merge.