Remove print statements.
Added testing for Component class; broke out mocks.
Also, the usual slew of line-ending changes.
Plus, deleted some comments/traces.