Made ShapeTableTest more robust.