Changes to the 'Component' header and removed the unused 'WorldTest'