Components tests clean up

- Cleaned up components tests code base.