Simplified. Deleted Component model. Added test for geometry