Fine tuning

* Added Tests to a few components
* Minor changes