Renamed Composite to Component
Unit tests