Code style.
Make unit tests aware of the new component dir.
Add unit test for component dir.
Merge branch 'release-2.2.1'