Recoded test class, to remove redundant code.  Untested.