Renamed components to shorter names, added a "component" section to tests.