Continued working on a test suite, modified shapeclass.h a bit