Extensive rewrite of shapeIt class

Updated use cases in tests