improving the components analyses; major code cleaning of tests
code cleaning and fixing the code
Merge remote-tracking branch 'origin/master'