Fixed bugs in components
Cleaned code in tests
Bug fixes