and SingleGeometryEntitySet for GeometricEntitySet with a fixed number of geometries. Also add a unit test.