12/22/14 - major new updates to ShapeML, TestML