2nd revision of test code. Chgd data structures.  Now with comments